Add fixed xmake derivation #16
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HU90m
force-pushed
the
xmake
branch
3 times, most recently
from
a86ee54
to
ff56df0
Compare
nbdd0121
reviewed
Jan 19, 2024
pkgs/default.nix
Outdated
| @@ -14,6 +14,7 @@ | |||
| bazel_ot = pkgs.callPackage ./bazel_ot {}; | |||
| llvm_cheriot = pkgs.callPackage ./llvm_cheriot.nix {}; | |||
| ibex-cosim = pkgs.callPackage ./ibex-cosim.nix {}; | |||
| xmake = pkgs.callPackage ./xmake.nix {}; | |||
There was a problem hiding this comment.
I'd suggest to use import instead of callPackage if the package is itself the override. This case if some body wants to further override, it will use the original override provided by pkgs.xmake instead of the overriden one which is less tuneable.
The xmake derivation in nixpkgs uses `lua.pkgs.cjson`, but xmake has it's own patched version of `cjson` with hex literals support. The CHERIoT RTOS requires hex literals to build. This derivation uses the internal patched version `cjson`. Note, there is a second fallback json parser within in xmake which doesn't have hex literal support either. Co-authored-by: Gary Guo <[email protected]>
nbdd0121
approved these changes
Jan 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The xmake derivation in nixpkgs uses
lua.pkgs.cjson, but xmake has it's own patched version ofcjsonwith hex literals support. The CHERIoT RTOS requires hex literals to build.This derivation uses the internal patched version
cjson.Note, there is a second fallback json parser within in xmake which doesn't have hex literal support either.
We are planning to upstream this fix and remove our version of the package once we have.